surface: Simplify some code
authorMatthias Clasen <mclasen@redhat.com>
Sat, 23 Mar 2019 13:35:14 +0000 (09:35 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 28 May 2019 20:25:14 +0000 (20:25 +0000)
Fold gdk_surface_process_updates_recurse into its
only caller. There is no recursion here anymore.

gdk/gdksurface.c

index e07448424f3cd9bd29f81fa47117d355815688a1..bd43f4dc5f6e27a06a75dadeb5f2d7f896898f54 100644 (file)
@@ -1144,22 +1144,6 @@ gdk_surface_schedule_update (GdkSurface *surface)
                                    GDK_FRAME_CLOCK_PHASE_PAINT);
 }
 
-static void
-gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                     cairo_region_t *expose_region)
-{
-  gboolean handled;
-
-  if (surface->destroyed)
-    return;
-
-  /* Paint the surface before the children, clipped to the surface region */
-  g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled);
-}
-
-/* Process and remove any invalid area on the native surface by creating
- * expose events for the surface and all non-native descendants.
- */
 static void
 gdk_surface_process_updates_internal (GdkSurface *surface)
 {
@@ -1182,10 +1166,11 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
       if (gdk_surface_is_viewable (surface))
         {
           cairo_region_t *expose_region;
+          gboolean handled;
 
           expose_region = cairo_region_copy (surface->active_update_area);
 
-          gdk_surface_process_updates_recurse (surface, expose_region);
+          g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled);
 
           cairo_region_destroy (expose_region);
         }